created modules, added logic file changed some logic around