More changes. Started re-wroking the UI part. Not sure how I want to handle communication between things.