WIP - Mid way through converting to a pyramid project