1 new commit added
missed one of the restructuring bits, not sure it is quite right yet
Pull-Request has been merged by asamalik