Started complete refactoring
Continue bug refactor
Continue bug refactor