M1 - Closing Issue #1

All required functionality from issue #1. Closing and merging.