FIXED TODO's, added getters and removed a few constructors