testing sweetness
massive code cleanups