WIP - still working on it

Always have problems pushing to git… will try harder next week.