Sooo close some small bugs still