Resolved TODO

Added simple os resolution.