Attempt at separating data from UI