Dev bamp

This is my first new pull request.