Assignment 12 Commit, Round 2

Re-exported just in case I messed something up.