implemented pickup
refactored editor
added todos