Some more refactoring / base setup for issues #69 #70 #71
will allow Nicholas to start setting up the structure