Issue/11

fixes #11 
Can these live in separate files?