Moved to basic SVG
Cleaned up code, fixed collision detection