Started to Refactor everything.......