Getting some basic functionality. Expect more frequent commits (per item from now on)