WIP, add static modifiers, comments