Starting work on collisions; some ergo tweaks to constructors