Got basic functionality done