Finished moving trait-stuff