Working project

all changes so that program seems to work