Rewrote about 80% of the source code - a fresh start so to say
Removed debugging output