Getting there - most functionality is now working