Jstamerj/proposed