This really needs a full rework