Starting to prepare for Theory. Removed dead idea from commented code