Quick Changes

Changed the flow of the program for readability and committed
non-working code. This makes it work…