progress
Big code push
Still not quite working...