Still a small bug (not the error), but yeah, getting there