Feel like there is a lot of improvement to be had here following this, but it's a start.