Completed initial feature implementation