Fixed a few bugs but we're not there yet