Today was test day. Caught many exceptions and updated functions to deal with them