Last commit before video check-in

Might be more code to follow later and I will update the readme later
tonight concerning the bugs, changes, etc.