WIP commit, added new logic.