Development changes, needs to be cleaned up