Much better traits, beginning to add working parts