Phase I and II
Merge branch 'master' of github.com:archaephyrryx/hw