more work on the fun part yay