all done, some collision bugs left