lots of changes. gui now complete