worked more on project, first part kinda working