everything seems to be working. doing a small refactor
basically working