Adds more for #4

Adds some structure