Finish basic feature developement