Getters & setters & TODOS

Added some todos for later.