Finished up a few classes and refactored many using Lombok.