Gonna fix and finish this