Finally done! just need junit