finished for now

will refactor code in the future