Push #4

Re-arranged some things. Now it can be compiled and run outside of
eclipse! Yuss! And I got rid of the warnings.