Done

Works on general now