made a begin with space structures
more todo
a begin of collision refactor
merge fix