v2.1

Edwin's to-do-list DONE