First commit - most things working