Small Update, Still refactoring code