mini project (mostly) complete

had some issues getting tests to function properly...