WIP-MK2

Mak AFS MK2- This is a work in progress