made it possible to have parts in parts
Cleaned up a little
Cleaned upp a little more...
Merge remote-tracking branch 'origin/develop'