cleanup
refactor entire project
fix type
more composer fiddling
composer still
cleanup