added some changes commented out debugging
added modules