chore(rewrite): Started on rewrite to add all desired functionality