Merge in hackedd's additions