Feature/adam variants

Cleaning up, looks like valid code