(WIP) Removed annotations as per Ryan's advice