Working on monch, cleaned up a bit.