Major refactor, step 1
0.1.12