Version 2 - correct naming, add object orientation, remove submit button