safety commit, don't know if i've made many changes since last time besides making hashmaps "final" and throwing in system logs