Full commit after weekend additions / changes