Architecture Changed
Merge pull request #2 from Sentient07/master

Architecture Changed, Interactive bugs fixed