made it possible to have parts in parts
Cleaned up a little