should have commited a while ago.. lots of shit being added

Signed-off-by: Daniel Berry <danie@danielberry.me>
lots of changes

Signed-off-by: Daniel Berry <danie@danielberry.me>