Dev

This is the final submitted version.