Removed extra stuff from the energy and combo tracker classes. Cleaned up main slightly. Testing more accurate movement. Added other box to play with.