will have to debug some issues but its looking good