Refactored some stuff, adding works, drawing not yet...