Add more functionality and update time regex

I could split this up if you like.