lots of changes to get angular running - works now :)