Init patch by Escepoch

init patch

An initial patch as a starting point.