Initial push of first working code