Adding lambda handlers, WIP...