Started working on asserts