needs testing and changes

Sunday, 13 July, 2014