Forgot to commit this earlier
Set various methods as properties