Initial Commit for partial ported api