Core requirements done; working on extra credit