Version 1 Working, many changes