Added a little bit of settup, but I have to go now (incomplete commit)