Got some bugs to kill
still working on it