Slight refactor, added TODO's