Initial work on making the remainder
More remainder stuff