Finishing up basic logic