Initial Commit. Closes both #1 and #2 already.