Ch3

Got the whole ui except for some table views laid out and flowing together, got the tests fixed and need to finish up the logic.