Initial commit of stage1 implementation

Hi Sebastian,

This is my first pull request. I think I see how things work on git/github better now. This first commit includes all the changes I implemented yesterday. It is definitely not complete (and correct) though, because I need to change a couple of ways I implemented things based on our call today!

Talk to you later!
--Tim