WIP Marked 2 support

Related to #9