Got basic core functionality done