Done, just fix the ui