WIP on fixing this