Working Version

Removed some unneeded code in the main loop
Commented out the broken block code that is in testing