Added AMS project and a bit more