First working code commit. This is functional... but still piles to do