Dev

New Controller and some issues resolved