Oops... broke it
Complete revamp