Pointer notation
Add surface struct, fix bullet movement
Resolve merge conflicts