Cleaned up backbuilder and added todo's