initial commit
never actually pushed this wip
merge two repos