Final commit before reverting 16 hours of work