update tags
From here on, move ##TODOs to ##Functionality when complete