Initial form
Adding in some new bits