Revert "Got some basic stuff coded in. UNTESTED CODE"

This reverts commit 34a4856778860a81f3d9207ff659244e624b0fbf.
Revert "Revert "Got some basic stuff coded in. UNTESTED CODE""

This reverts commit a8548c0cdadda59c8916acea73f7671da7da4e5c.