Moved some things to directive
Pushed not working spike. To fix