Added code from school

Also has working collisions