Refactored project and Supressed a lot of warnings...