renamed things and finished project (mostly)