Lots of changes, bringing project up to date