Initial feature set and design implementation complete #1