Getting towards some working code! Woo yeahgit status