now with a 'complete' AMP implementation, and non-working tests