Moved old code but kept temporarily for reference purposes.

Commencing design from ground up this time instead of "quick fixes".
Final design in mind