Finish basic functionality