Initial commit
Removed extra targets
Merge branch 'local'