Got basica functionality working