Initial commit

Working on making sure collision works properly.