Some Code Changes

Still under construction...