2nd commit. Basic functioning.