Make executable
Fix bugs with service methods. Add comments