more work
Merge branch 'master' of https://github.com/codfish92/principles
got most stuff working, no smart comp though