Trying out returning an object.
Fixing keypresses.
Merge branch 'beta'