Cleaned up inheritance a bit
Merge branch 'cleanup' into develop