Committing so I can keep working on laptop.

Just added a couple if else/let snippets