No commits until now, everything except for the error checking done
Added error checking with regex