Working on Lab3 ...change magic numbers, move methods to appropriate classes