v0.6 Major Code Refactor