Add a few TODO Bugs, move Responses logic away from markup