inital merge with alpet files