New start, cleaned up code.