Code organization build 3

.on function problems and quits