Post logic refactor, start of get functionality