update marking logic
add things
update camera
add new objects to the world
merge assets into development