Issue4 pt:1
Until we have actual propagation of real data to the ui i wont know how to continue, therefore I'm merging this into master to prevent any conflicts in the future
Until we have actual propagation of real data to the ui i wont know how to continue, therefore I'm merging this into master to prevent any conflicts in the future