Finished up basics. Need to redo logic for core widgets.