Finished implementing outstanding functionality