cleaned up old code and files
merged in develop
basic cleanup
added empty matrix controller