Moar better, still working through it