fixed merge conflicts
Basic Controller. View needs some threading work done on it.