WIP: marked areas that need work