working version

made sure everything ran and compiled since my hiatus