Rewrote the files by hand and changed the inheritance structure
Authored by: Jorrit Wronski 2015-10-11
Parent: [59e362]
Child: [0a715a]