Completed all baseline functionality