Working on Refactoring. Nothing Yet. :(