Update from today's work

To be compiled still..