Clayton: Tried adding functionality from Jungs project