Got most core functionality done