Almost have the basics working