Moving into git now that basic functionality is working