Revert "Revert 11868ff..73feea9"

This reverts commit 43fc6d0f9848dd290d5995c683d646d6c4c06de5.
Revert "Revert "Revert 11868ff..73feea9""

This reverts commit 21574e4f5cb81fbf59621612f7107b84f0be274c.
Cleaned Up (Use this Branch now please!)

Reverted to Pre-Graphics plus working graphics modules