new design done, needs more detail adding though