Hopefully last update for sprint 2. Ready for deploy.