A few more changes and a nice clean up. Starting to actually work!