finished all the major features