More groundwork

now we can start doing better commits :)