Lockerino duo

The most recent working (hopefully) code