Major code refactoring & Begin GUI coding