#162 Reorganized, made some changes