Moved constructor logic/added TODO's