Major refactoring
Beta Build
Beta Build