Entity conceptual work + GUI conceptual work. Will probably delete these
classes anyways.
Merge remote-tracking branch 'origin/master'